(doctor-doc): Add 2 question words.

(doctor-getnoun): Parse and save the complete object phrase.

diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 4254a99f27eec8628d18e5c217d842ff153c8686..2f00b9dfb3a61b09dbe3737864217b3ced5550fc 100644 (file)
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -905,7 +905,7 @@ Otherwise call the Doctor to parse preceding sentence."
                        'sentence 'used 'was
                        "..."
                        '(doc// bak))))
-   ((memq (car sent) '(do has have how when where who why))
+   ((memq (car sent) '(are is do has have how when where who why))
     (doctor-type (doc$ qlist)))
    ;;   ((eq (car sent) 'forget)
    ;;    (set (cadr sent) nil)
@@ -1166,7 +1166,9 @@ the subject noun, and return the portion of the sentence following it."
                                                   (car x) (car x))))))
                                     " ")
                       (doctor-getnoun (cdr x))))
-       (t (setq object (car x))) ))
+       (t (setq object (car x))
+          (doctor-build (doctor-build (car x) " ") (doctor-getnoun (cdr x))))
+       ))
 
 (defun doctor-modifierp (x)
   (or (doctor-adjectivep x)